From 1519c3e277a6aa69cfde6b8f678f5401c552e1d3 Mon Sep 17 00:00:00 2001 From: Graham Inggs Date: Wed, 22 Dec 2021 18:25:14 +0200 Subject: [PATCH] Use grep to generate Uppercase.txt and Lowercase.txt --- debian/changelog | 1 + debian/patches/use-unicode-data.patch | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4ccc1e0..b4f9bcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ utf8proc (2.7.0-2) UNRELEASED; urgency=medium * Use GraphemeBreakTest.txt as is, re-enable graphemetest + * Use grep to generate Uppercase.txt and Lowercase.txt -- Graham Inggs Wed, 22 Dec 2021 16:12:17 +0000 diff --git a/debian/patches/use-unicode-data.patch b/debian/patches/use-unicode-data.patch index 52aabae..ea81298 100644 --- a/debian/patches/use-unicode-data.patch +++ b/debian/patches/use-unicode-data.patch @@ -8,7 +8,7 @@ Last-Update: 2021-12-22 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/data/Makefile +++ b/data/Makefile -@@ -25,31 +25,31 @@ +@@ -25,37 +25,37 @@ UNICODE_VERSION=14.0.0 UnicodeData.txt: @@ -48,4 +48,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + cp /usr/share/unicode/emoji/emoji-data.txt $@ Uppercase.txt: DerivedCoreProperties.txt - $(RUBY) -e 'puts File.read("DerivedCoreProperties.txt")[/# Derived Property: Uppercase.*?# Total code points:/m]' > $@ +- $(RUBY) -e 'puts File.read("DerivedCoreProperties.txt")[/# Derived Property: Uppercase.*?# Total code points:/m]' > $@ ++ grep -zoP '(?s)# Derived Property: Uppercase.*?# Total code points:' DerivedCoreProperties.txt > $@ + + Lowercase.txt: DerivedCoreProperties.txt +- $(RUBY) -e 'puts File.read("DerivedCoreProperties.txt")[/# Derived Property: Lowercase.*?# Total code points:/m]' > $@ ++ grep -zoP '(?s)# Derived Property: Lowercase.*?# Total code points:' DerivedCoreProperties.txt > $@ + + clean: + rm -f UnicodeData.txt EastAsianWidth.txt GraphemeBreakProperty.txt DerivedCoreProperties.txt CompositionExclusions.txt CaseFolding.txt NormalizationTest.txt GraphemeBreakTest.txt CharWidths.txt emoji-data.txt -- 2.30.2